]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
background: Pass cancellable when querying file info
authorFlorian Müllner <fmuellner@gnome.org>
Wed, 13 Apr 2022 18:14:47 +0000 (20:14 +0200)
committerMarge Bot <marge-bot@gnome.org>
Wed, 13 Apr 2022 21:12:27 +0000 (21:12 +0000)
Otherwise it is possible that the operation completes successfully
after the background has been destroyed, which will throw a warning
(caused by accessing the this._fileWatches object after it has been
nulled).

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5337

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2268>

js/ui/background.js

index 198194a50bf7aef5c519b48449dda92c79e0fb56..825fee0d9b287bfe508301e8f8efcd1ccf9ab7fc 100644 (file)
@@ -492,7 +492,7 @@ var Background = GObject.registerClass({
                 Gio.FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
                 Gio.FileQueryInfoFlags.NONE,
                 0,
-                null);
+                this._cancellable);
         } catch (e) {
             this._setLoaded();
             return;